(font-lock-default-fontify-region): Fix last

change.

diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 5316b110995cb9f36fc25d1dd904974b6eaf56ff..188b5de7fe8172070c6c23b4ff6c58e722c6cd05 100644 (file)
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -1212,10 +1212,10 @@ The value of this variable is used when Font Lock mode is turned on."
                          (point-min)))
            (goto-char beg)
            (setq beg (line-beginning-position)))
-         (setq end (or (and font-lock-multiline
-                            (text-property-any end (point-max)
-                                               'font-lock-multiline nil))
-                       (point-max)))
+         (when font-lock-multiline
+           (setq end (or (text-property-any end (point-max)
+                                            'font-lock-multiline nil)
+                         (point-max))))
          (goto-char end)
          (setq end (line-beginning-position 2))
          ;; Now do the fontification.